Don't open a display connection.

2006-06-18  Matthias Clasen  <mclasen@redhat.com>

	* tests/testnouiprint.c (main): Don't open a display connection.

	* gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make
	this work without a display connection.  (339702, Alexander Larsson)

diff --git a/ChangeLog b/ChangeLog
index 01f174a2d01e9929bb5a7419f940c92b8fcd95d3..69affb2a02bef9e622e44c7466a3a507a83139e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testnouiprint.c (main): Don't open a display connection.
+
+       * gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make
+       this work without a display connection.  (339702, Alexander Larsson)
+
        * gtk/gtkwindow.c (gtk_window_move): Small doc addition. 
        (#345275, Behdad Esfahbod)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01f174a2d01e9929bb5a7419f940c92b8fcd95d3..69affb2a02bef9e622e44c7466a3a507a83139e6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2006-06-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testnouiprint.c (main): Don't open a display connection.
+
+       * gtk/gtkprintbackend.c (gtk_print_backend_load_modules): Make
+       this work without a display connection.  (339702, Alexander Larsson)
+
        * gtk/gtkwindow.c (gtk_window_move): Small doc addition. 
        (#345275, Behdad Esfahbod)
 

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index a70582b7a1b6bcfcd53fbd6fad376f2e19021902..613d88d4be97208329892ab0b2ab78c0d0a43818 100644 (file)
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -284,8 +284,10 @@ gtk_print_backend_load_modules (void)
   gtk_print_backend_initialize ();
   
   settings = gtk_settings_get_default ();
-
-  g_object_get (settings, "gtk-print-backends", &setting, NULL);
+  if (settings)
+    g_object_get (settings, "gtk-print-backends", &setting, NULL);
+  else
+    setting = g_strdup (GTK_PRINT_BACKENDS);
 
   backends = g_strsplit (setting, ",", -1);
 

diff --git a/tests/testnouiprint.c b/tests/testnouiprint.c
index 585c5ddbece9192704446344fa3a3a052aafae8f..1c39ae9a7cacb6d49137fcfb82fc400167fc6a34 100644 (file)
--- a/tests/testnouiprint.c
+++ b/tests/testnouiprint.c
@@ -84,12 +84,8 @@ main (int argc, char **argv)
   GtkPrintOperationResult res;
   GtkPrintSettings *settings;
 
-  
-  /* Unfortunately we need a display for the XSettings to get the
-     list of backends... */
-  /* gtk_parse_args (&argc, &argv); */
-  gtk_init (&argc, &argv);
-
+  g_type_init (); 
+ 
   loop = g_main_loop_new (NULL, TRUE);
 
   settings = gtk_print_settings_new ();